ImapFolderAgent: Handle a mail without a body
This addresses #745.
Akinori MUSHA
Se han modificado 1 ficheros con 6 adiciones y 4 borrados
+ 6
- 4
app/models/agents/imap_folder_agent.rb
@@ -525,17 +525,19 @@ module Agents |
||
| 525 | 525 |
|
| 526 | 526 |
def has_attachment? |
| 527 | 527 |
@has_attachment ||= |
| 528 |
- begin |
|
| 529 |
- data = @client.uid_fetch(@uid, 'BODYSTRUCTURE').first |
|
| 528 |
+ if data = @client.uid_fetch(@uid, 'BODYSTRUCTURE').first |
|
| 530 | 529 |
struct_has_attachment?(data.attr['BODYSTRUCTURE']) |
| 530 |
+ else |
|
| 531 |
+ false |
|
| 531 | 532 |
end |
| 532 | 533 |
end |
| 533 | 534 |
|
| 534 | 535 |
def fetch |
| 535 | 536 |
@parsed ||= |
| 536 |
- begin |
|
| 537 |
- data = @client.uid_fetch(@uid, 'BODY.PEEK[]').first |
|
| 537 |
+ if data = @client.uid_fetch(@uid, 'BODY.PEEK[]').first |
|
| 538 | 538 |
Mail.read_from_string(data.attr['BODY[]']) |
| 539 |
+ else |
|
| 540 |
+ Mail.read_from_string('')
|
|
| 539 | 541 |
end |
| 540 | 542 |
end |
| 541 | 543 |
|